themes: Make fallback work a bit better
authorMatthias Clasen <mclasen@redhat.com>
Thu, 15 Apr 2021 21:08:15 +0000 (17:08 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 15 Apr 2021 21:09:46 +0000 (17:09 -0400)
One case we did not include in fd329e0ec582d7562f444b is

Adwaita-dark -> Default:dark

It turns out that it is needed.

gtk/gtkcssprovider.c

index 56b243f1c1ef7f9e9fcd32636d3b71f5e62edc3b..91e5f6240f75aa92797419dc7d5ca68627c8639d 100644 (file)
@@ -1384,7 +1384,12 @@ gtk_css_provider_load_named (GtkCssProvider *provider,
     }
   else
     {
-      /* Things failed! Fall back! Fall back! */
+      /* Things failed! Fall back! Fall back!
+       *
+       * We accept the names HighContrast, HighContrastInverse,
+       * Adwaita and Adwaita-dark as aliases for the variants
+       * of the Default theme.
+       */
       if (strcmp (name, "HighContrast") == 0)
         {
           if (g_strcmp0 (variant, "dark") == 0)
@@ -1394,6 +1399,8 @@ gtk_css_provider_load_named (GtkCssProvider *provider,
         }
       else if (strcmp (name, "HighConstrastInverse") == 0)
         gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, "hc-dark");
+      else if (strcmp (name, "Adwaita-dark") == 0)
+        gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, "dark");
       else if (strcmp (name, DEFAULT_THEME_NAME) != 0)
         gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, variant);
       else